Update fix cat
Java stuff
more java stuff