bug fixes
updates to fireup

Signed-off-by: Izhar ul Hassan <ezhaar@gmail.com>