Finished EC&Various bugfixes