small changes
minor changes and bug fixes
minor changes