fixes + cleanup
More usage examples added
urgent bug fixes