some changes after removeing local and lib and src and a few other things, keeping changes done otherwise up until 8/10/2013