Cleaned up a little and renamed new methods to match existing methods. Also fixed a couple of minor bugs introduced by the recent changes.