More Updates and Fixes