various fixes and extend few methods