Added a few neat things