add all the last minute hacks we did on the server