Last minor changes, should be ready for merging