Additional feautres and bux fix