Improvements and Error Fix