updated with more console stuff