Fixes

Fixed most of errors that came up in Eclipse.