re-added some files and fixed a few errors