added hockeyApp and overall fixes