few more bug fixes :relieved: