added parts of the ausruesten function
fixed mergin issues and the charactercreation bug