fixed some stuff. still thinking about this package, open to sugestions