Added more/better comments