fixes in code