finishing touches. Probably should've commit a lot more on this project