Code improvements + verbose mode added