few fixes and improve manual request