#54, #49, #48 and small fixes