Fixed some MED and LOW priority bugs as well as other alignment issues