cleaned up, better comments, master servers