Buncha updates

Includes several updates and bug fixes