Further improvements of operating system and additional cleanup.