Fix the amp and clean up a little