added lots of stuff, should only have exit status left to do
fixed fixed merge clashes