changes and fixes made for Endlessm