Mostly going through and commenting things
Major changes in this commit are caused by the new setup on my surface