Move more personal stuff out
Add some more comments