General bugfix sweep

several issues have been resolved, there are still issues with the
damage model however.