Enhanced the bare bones non-functionality