Errors Fixed and Design Changes