General fixes and additions