added features -cm,aokp, fixes