Finalized current comment system! Refactoring included