Began fixing old design flaws. Current build has errors