genericized things
java 7?
cleaned up bin folder