fixed annes bugs