Some updates in landing & trying make settings work with apiary