fix loading; cleanup