fix final errors? :o