[AESH-48]
added type to option
[AESH-43]
work in progress
[AESH-43]
using ~/ should display correctly now
+ some cleanup