few more changes here and there!