Bug Fixes #2

Please Read...