fixes for my dodgy syntax