database fixed mostly...