applied fixes & changes without format code

-.-