moved potw buzzkil1 to feature and minor edits