some fixes

maybe someone could recompile the jar so it's half the size (since I included the .java files in it) if this is wanted