hr not placed @ last section, also some naming fixes