various fixes and fudling