bug fixes, naming