Various improvements

Signed-off-by: Rohan Mathur <rohanmathur34@gmail.com>