part1 stuff added
bug fixes