fixed bugs and up ver