old shit removed
a lot of new stuff