fixed a few things and added/moved folder-files around