Replaced 2 methods with overloads of Qt

Also fixed a small bug and found a new one. Surprise.