added calculator and some functions