CyanDream fixes and modifications