Finalising feature and some small stuffs