Width and misc adjustments, closes #6