Some more timing/sound fixed