fixed many more bugs

Signed-off-by: Sweil <mail@sweil.de>