fixes and tricks