Updating and fixing stuff up some...