fixed timing problems, incorrect button box mappings