Much fixes, many pain, still buggy