Fix a couple bugs & remove extra console.log's