Might have finally fixed that bug and some other things