Fixes & More polishing