refactor, fixes etc