continued updates, many which will probably need reverted to a few commits ago