Some Fixes out of Dev-Branche

Some math inside :)