Some bugs fixed
Major update

Added more dynamics to WAI