fixed block user a little bit + some more stuff