Organisation and minor fixes