added stuff
deleted a bunch of useless stuff
accidentally deleted wrong files, restored some