:anger: Ready + Fixes