Fixed More things

Accidentally put in classes instead of java source.. fixed