fixing up small things for more automation