few bugs from shifting things around - should actually work now