Cleaned up code. Fixed wel reading problem so that test1 problems work again now.