basic improvements
add more to the skel