Remove unsigned
Fix bugs and refactored