fixed some stuff and added u64