fixed buggy stuff