Bugs fix and some changes in custom/etc files.