bug fixes but there are more to fix