Various Code Changes