Sorted out some basic things.