add Demo Calculator and some fixes