work on bugs
fixes