few more enchancments added