a few little changes, just to make things nicer and cleaner
nevermind, it broke things