Made refinements fixed bugs.