a few more stupid mistakes - I really should get some sleep