working through some small fixes etc.