some moar changes etc