Finished tightening the code and ICPU bug fix