fixed some tings