massive update including alignment and asynchronous execution on the server (not really in use yet though)