changed a few things to remove warnings in eclipse