updated few things, ready to post