cosmetic changes, fixes to loader, nicen up everuthing