Fixed the double bullet issue, cleaned some code.