naming things better and tweaking :rage1: