Working draft of new features
Minor fixes