moar changes

moar changes
fuck eclipse and java