Further improving fluent interface and various bug fixes