Changed a few comments and adjusted some puts