#1 fixes, changes in api