fixes and samples