Cleanup, master server bypass, added fire button