fixed bugs, more prototyping