Cleaned up things to work with win32, minus text rendering