misc fixes; added cycloids