minor changes and bigfixing