bug fixes, updates on functionality