added more fiels and fixed a few logical issues that were added because i didint understand the system