Improvements and Error fixes