Tp/more changes

Look at all these delicious changes.