fixed some minor discrepencies with my previous commit