General cleanup & updates.