fixed some issues OS-related issues and other stuff