small fixes related topics and features