fixed some stuff due to prev. renames and new :require