Small changes
more stuff