update to M5
update annotations
clean up client (a bit)