fixed some issues, probably created some more ;)