Server finalization and bug fixing