some late fixes and additions