Added AdvMAME, minor cleaning up