Various updates and additions. Please see the README for more details