Pulled fixed modules from pcbattempt-alex-0.3/1 branch
Updated modules