Fixed issue with ambiguous an / -an thing. Also fixed a few problems
and added asc