Removed pCalculator and other tweaks