Bug Fixes

Git Hub Issues 1,2,5