fixed little bugs and sp mistakes, forgot to make new branch again