removed some warnings, slight changes to mkv