updates to my branch, not all of them are particularly functional