added specs, fixed some features