re-adding files for comments

Well implemented wrap-up of properties handling.