- adding various fixes and changes