Improved coding and tested extra features