Some bugfixes, Stuck with ETyping