FIXED: Various fixes.