Bug Fix/Improvements