Some GUI work, fixed some Calculator bugs.