Moved some logic, some fixes (nullpointers on loading), dropping heads