bug fixes left right kinda work