Fixes & Improvments