fixes to wrong static dir + few more cleaning changes