little fixing up on random stuff