Optimize and fixes