Magnus: did some work on his class
Marco: did some commenting, some checks, some fixing of minor stuff