Minor Bugs fixed - review needed