sample update and size fixes