updated to current master, removed unneccessary files, fixed a few things