Organisation fixes, schema update & various bug fixes