fixed some borked up old-new stuff