Updated for new facdev layout and updated some commands