minor fixes - it needs a lot more