Refactoring; Fix dragon directions sometimes messed up