os_8 and some cleanup