full play support, small tweeks and fixes