Small fixes;
Structure cleanup.