fixed some things, still version 1.0