0.1b fixes

Almost realy, just need /aw stuff