Tweaks to basic interface