Fixed some issues with hard coded data