Missing some files
Added some stuff
clean up