Most Of the bugs worked out