Some fixes and added option to not demean.