polished a few rough edges