bunch of fixes, sigh
how was that not committed..