okay, more shit moved/fixed