Work done + little bug fixes