Fixes

Fixes, standardisation, comments