added new modes and fixes minor annoyences