Separation of local and server scripts + update of a bunch of stuff