Fixed some package setting issues, and switched fully to \unit commands in text