Cleaned up app.
Fixed buffer over run in service.