Bug fixes and name change