Lots of pre-planned fixes and commented some unused modules