Supericy

Multiple changes, see commits.