Sorted out more bugs.