Random Additions & Fixes

Random Additions & Fixes