bug fixes, renames, and default clone method