Dev Branch Fixes