Finished some stuff up