Made stable + misc WIP