fixed the errors on the initial commit, haven't test anything yet.