Debbuged and fixed some issues.