Completed. Fix minor things