Hopefully fix some annoying bugs.

did have to remove a feature though, maybe some more coming though.