final bunch of fixes on test server, before moving to real one