Fix & Improcements