amptester makes quite good predictions now, + manual fixes