ebeacons added
multiple bugfixes