bug fixes, API (alpha version)