fixed lots of issues