fixed some bögs