calculator overhaul work in progress
little cleanup of *~ files