Various Updates/BugFixes (Why not?)