Bug Fix And Added stuff Feel free to help!