Improvements and adding some functions.

Improvements in importing system, as well start of calculators.