Fixed some naming, bug fixes.