more changes

moarrrr changes