Working with normalizing and fixing some bugs