lol, improved some java, fixed button