More bugfixes and stuff. We ready for first beta test