bug fixes. almost available now