Working Revision 2 , More Errors Resolved