some moar changes