Modified method names, made everything a bit cleaner, made some new accessor methods