some of #916

Please review every file and comments and tell me what is wrong so I can fix =)