some more bugs removed in order to get a play to actually work