Final fixes and additions