adding specs, cleaning up basics