Fixed small bugs, added some types, trying to make