General fixes and less CPU usage