bug fixes, more features