Added Errors and some simple design changes