ironing out some rushed fixes