Fixed last issues, some commenting needed