Consolodated boundary classes to one class and did some bug fixes elsewhere.