updated a little here and there