Updating a few things
Removing eclipse errors
Removing more Eclipse errors