added connections,
fixed logical issues,
fixed null pointer
..
need calculator object class for testing ...