Fixed buggs and some painting, gunter dir and so on