Improvements and gcalc wrapper