fixing tals and such