Fixes n' features

See commit descriptions again :)