General cleanup and additions