[FIX]Fixed some miscallaneous issues.