added and organized a few things