better UX and bugs fixed v0.0.4