Bunch of Small Fixes/Additions