refactored
added calc engine, updated stuff
added stuff
a change
some fixes