Model fixes & Cleanup