fixed bugs final polish