various fixes and experimentation