Made some final changes to analyzer

Hopefully everything is done