Small updates and notes on planned implementation