Fix bug
Change behavior for FS methods
Make commands more friendly to work with