Added wawla support.
Did some minor cleanup. Added todo.