organizing and last additions for 1.7 update