more progress with getters and setters. general cleanup.