fixes & base alteration

added "second table" to the "database"
wrapped in JSON all returns that were left