add Viktors fixes

@vigsterkr feel free to merge once done