Convars and other fixes
Aw library tidy up