EoD

changed some functions, adjusting functionality