fixed some errors, bs still happens