bug fixes, more to come..