Fixed glitch, more work on slots