Few bug fixes, code cleanup