Some small changes - still no idea what I'm doing...