Fix: Various fixes and organizing changes.