Bug Fix & Improvements