added even more comments and some spring cleaning