consolidated changes

Consolidated changes into one commit 
do you need to commit all the files under /.metadata/...?