better and badder code

-tidy up a bit
-working on making heart containers work only in special slots.