Some minor fixes, some stuff is unfixed yet
minor fix