Lower CPU Usage and small changes