cleaned up some experiments and fixed menu