Fixed shitty time behavior, also maybe some minor shit