A15 cleanup

fixed some issues with wierd crap happening in places for no good
reason.