fixed some weird issues