More bug fixing and feature tweaking