Slight tweaks from few days building out prototype