Removed more occurences of map::at. Minor refactoring - accesor methods.