Final version of clever and sunday, fixed bug in server, added map