Bug fixes, and new relic added