minor bug fix, major bug fix to come