CV control added + some other fixes / additions