Few bugfixes here and there, "AW support"