feat(#14, #15, #13): general improvements and features