Code updates

Just a few updates