New src comments and constructor bug fix -just for sure