Added EC methods, did some cleanup