Change modes and various minor things