Fixed Various Issues