Small update
Small bug fixes, last part is implementing the paid amount