Integrate & Fix overall bugs