Added some java stuff and messed with icons