fixed some shiz :)