Dev and Fixes