Made changes to allow for better bug tracking.=