Fixed a few melody bugs with new system.