Misc fixes
First initial commit.. Just a mess right now...